Added one more condition