final changes 1.0