mods to support new box naming