serverProxy refactor done