Still trying to get the ordering right