Improved js