fixed stuff for new assignment system