Added new heartbeat stuff