minor api changes
merge resolved