bring in BG's changes