removed UNTIL loop