updated for class submittal