Moved EInter and WInter waypoints to align with short hall