Switch command order, to meet with current specs