Further hackery