Now using EIQuad for rendering. Removed HACK