added / altered conditional