model ordering finally fixed