Some changes in main