Updated to latest BDM