revamped to use the current heartbeat messages instead of creating our own.