removed c++11 feartures, added data