can now pass parameter to determine if remote or not