add more conditions