Added more conditions.