Adding more hacks