final changes2