New JS
Merge branch 'new-js-code'