Rich&Michal: Refactored 'I am on' steps to make them more consistent.