Dgoodwin/string update