Some changes to main