updated to v2.0