more fiddling
fixed merge conflicts