Introducing concept of enabled/disabled and returnOnDisabled states.