Changes in main.c