Updated to do more processing on remote side