Moving all four points
Fixed merge conflict