updated Conditionals and Loops