Added a few hacks