Added more hacks