2.0 final changes