Complete Hotspot Rewrite