Moved all the hacks to a new file