final commit for js-engine support