moved 'include return journey' to first section