class assignment finish
made some changes