Updated to SRM #602