pushing the conditional in