Merge with Johann's FSR