few changes in main file