adding back in support for v1 option