some changes in main