Updated While Loops to match Rubric