updated to newest mousetrap.