We're doing this within a for loop - can we un-loop this?