Added some icmp magic