Update to using Phinci, untested