Added ability to re-order criteria