Changed Master Main class