More changes to main.c