Added things needed for state transitions