added metrics and fixed shading !