Minor changes in MainClass to take input