removed strings and sstreams
added namespaces