updated 5/21 class