re-ordering params for a cleaner diff