Making some final changes