final changes hopefully