Continuing changes to shading function