updated conditionals
Signed-off-by: Alex Lourie <djay.il@gmail.com>