moved some js around