Basic transition logic added