badness fiddling
merge