Added hacks