More changes for transition