New implementation of class ordering done.