A few changes to main