diffed from original to martini config