Added ping back in