#125 supports remote and local version