Modify to run it remotely