Improved and tested MovingPolygon