made some changes to the main