Modified a few things for pinging