Add cond 2 and cond 3