Minor changes in ordering