fix all funtionality on remote side