commit for v3.0