Added additional conditions :(