Just some changes to main