some more hacks