add missing CONDITIONAL’s