Started updated to GOALS questions ordering