fixup! Improved CA Performance + Guard Heat