Added flags for proper Movement handling