cleaned up our hacks