switched to c++11 style production code.