Fixed weaknesses to ordering