adjust a few for v2