changes to use new classes