change order or fields to better reflect workflow