overhaul to v2