LBF specific mods