small changes to classes