add more hacks