Update to work remotely