Corrected classes and mehtods