some changes to classes