Fixed up to run on fhr