conditionals update

update