[JFG-551] finish off