added transition stuff