final changes again