returned to using classes