Done some minor hacks in pinger