Added a do while loop