reording conditionals