Upgrading to Mousetrap 1.3