added separate support for v4