added transition control