some more changes to transition