Handle whether/if also when PREP before