Dev: edited Main class