updated to work remotely