Adding Js changes + new files
Merging changes