final changes and extra