hacking on #46