several changes to finish the class work