Major update to v2