Modified moving polygon and other minor changes