refactored proxy / added ping