merged mike's changes for fwhm