Catmouse revamp.