Updated to loop through new user inputs