Lots more hacking