bring v2 up to v1 standard