Adding more conditions