minor changes
after merge