fixing up class