Improvements in JS