heartbeat stuff added