minor re-ordering