Improve BO design