Modified Main Class