Modified S4 and S8 according to LHCb definitions