Re-Added avahi