Resolve latest comments from Chris Jones