Making final changes...