JFG-619 a small re-factor