Refactored to remotely