finished changes in main