This better mousetrap looks promising.