Added some dirty hacks and stuff
Even more dirty hacks