some changes to class diagram