changed char* to string across files