Added more conditions