improved Demos/Heartbeat