some (!) changes