adjust how heartbeat announcements get made
touch up testing