Updates added to main.cpp