Added additional conditionstatement