Corrected heartbeat switch and simulations