Idling, flags, refactoring