some changes on classes