This doesn't seem to be less performant than the rube goldberg we had previously, but somehow fixes up rendering glitches.
