changed to classes