Made some changes to Main