finishing the conditionals