New Main Class by Tibi