A few changes in main