Reverted back to old way of heartbeat