type names changed and argument list added to main.cpp