only some minor changes