Edit: JFNK minor