Added one more condtion on it