add server proxy to implementation
add new logic