Updates to deal with ordering