few more changes to classes