Fellowship Conversion changes