1.7.2 ping support and some rewrite