ordering issues fixed