Moved hacks to the new method.