Modified to be compatible with PbPb dataset