More work on the BDG import
More work on the BDG import