some more hacking