merge improvement
some more changes