Added screen state machine