Rework ograph.cpp and order2.cpp