some changes to main