Update to trusty default formalism