some minor changes again