fixed #8 and Refactoring Assessment, Manage_assessment