global minor changes
minor changes merge