final changes#2