Add some hacks, and source