Revamping ping with more options