added hacks