   (interactive)
   (let* ((pos    (liquid-get-position))
 	 (ident  (liquid-ident-at-pos pos))
+	 (sorry  (format "No information for %s" ident))
          (annot  (liquid-annot-at-pos pos)))
     (if annot 
 	(liquid-tip-popup annot)
-        (liquid-tip-popup (format "No annotation for %s at %s" ident (position-string pos))))))
+        (liquid-tip-popup sorry))))
 
 
 ;;;###autoload
-(defun liquid-tip-init ()
+(defun liquid-tip-init (&optional mode)
   "Initialize liquid-tip by making all identifiers buttons"
   (interactive)
-  (progn (button-lock-mode 1)
+  (progn (if mode (setq liquid-tip-mode mode))
+	 (button-lock-mode 1)
 	 (button-lock-set-button liquid-id-regexp 'liquid-tip-show)
-	 ;; (button-lock-set-button "yoga" 'liquid-tip-show)
-	 ;; (button-lock-set-button "mydiv" 'liquid-tip-show)
+	 ;; DEBUG (button-lock-set-button "yoga" 'liquid-tip-show)
+	 ;; DEBUG (button-lock-set-button "mydiv" 'liquid-tip-show)
 	 ))
 
 ;;;###autoload
-(defun liquid-tip-update ()
+(defun liquid-tip-update (mode)
   "Update liquid-annot-table by reloading annot file for buffer"
   (interactive)
-  42)
-
+  (let* ((pos  (liquid-get-position))
+	 (file (position-file pos)))
+    (liquid-annot-set file mode)))
 
 ;; DEBUG (defface my-tooltip
 ;; DEBUG   '((t

	 (ro    (gethash-nil r tys)))
    (gethash-nil "ann" (gethash-nil c ro))))

;; -- Display --------------------------------------------------------------

;; If you want the separate balloon-popup
(defun liquid-tip-popup (text)
  "Display text in a window popup"
  (if (and (functionp 'ac-quick-help-use-pos-tip-p)
           (ac-quick-help-use-pos-tip-p))
      (pos-tip-show text 'popup-tip-face nil nil 300 popup-tip-max-width)
    (popup-tip text)))

;; If you just want the ascii-popup
;; (defun liquid-tip-popup (text)
;;  "Display text in ascii popup"
;;   (popup-tip text))


;; -- Compute range ---------------------------------------------------------


;;; Code:
(eval-when-compile (require 'cl))
(require 'auto-complete)
(require 'json)
(require 'pos-tip nil t)
(require 'thingatpt)
(require 'button-lock)

;; (require 'json-mode)
;; (require 'ring)
;; (require 'etags)
;; (require 'flymake)
;; (require 'eldoc)
;; (require 'log4e)
;; (require 'yaxception)

;; ------------------------------------------------------------------------
;; A structure to represent positions 
;; ------------------------------------------------------------------------

(cl-defstruct position file row col)

;; ------------------------------------------------------------------------
;; Utilities for reading json/files
;; ------------------------------------------------------------------------

(defun get-string-from-file (filePath)
  "Return filePath's file content."
