reverted to the non c++11 branch code as testing