Improved JS
Improved JS