Merge in new transition changes