Little new stuff change to Main class