add some hacks