updated mousetrap