Improve heartbeat