Built a better mouse trap