Fixed -- added stuff from the class