Improved the js