Added proper transitions