Robbie's main.c changes