removed warnings and triangles