minor changes after v2.0