some changes to work with yannick's intra stats