still trying to fix transition