Improving the performance of the heartbeat