integrating some of surabhi's changes into d-Bauggle