added a few hacks