small issues and a big performance hit...