small changes to classes
to match master
to match master
to match master