changed some js back