adding final changes