Added some changes to js