made changes to fix transitions