Making minor changes to order to keep consistent