few changes in main