Fixed up ordering a bit