Improve ShadowMatrix