Dumb down for merge...