got rid of while loop