Updated to remoteSetup change