Added some nice hacks for improved rendering speed