few changes again