checkout 3.0 branch