Use i-spy lib rather than copied impl