reverting master code for v2.0