Made some modification to the Main file.