Better BDD (on-going)