Major changes on JS