New version with ipv6 support