final changes 1