made changes to the conditionals

changes