partial changes to next and until