conditionals  commit 2

conditionals commit 2