Some more hacking