minor change to second condition