Added final changes