MWPC and RangeFit added