updated C++ --> C++11