minor changes 2.0