merged in masterSarah for transitions