Merged all hacks into a separate branch