Use a while loop here too