Updated to account for current classes