minor changes
manual merge