Second commit (js added)