Fixing up ordering