JS Improvements