More js stuff
Fixed conflict