updated shading to match
simplify shading