added conditions in if statements as features