changes to support bdhw