added the hacks