Partial update to v2.0