hacking on the Simplify branch