Finalising LBHC changes