Added Eisfee substitution. Somewhat crude.