commit 14b - adding conditionals