Slightly improved drawing performance