Modifications from Rong-Shyang to match settings used at PSI