changed the order of the conditionals

conditionals make sense now.