More logical ordering