Main Class corrected