Somewhat closer to fixing the shadows