final changes 2