Update for main.cpp