Updated main to include proper headers