Building a better diesel mouse trap