Making final changes