minor changes
minor merge