Part two of my recent edit - not as good of a loop