2nd attempt at conditional deployment