annotate original like fabien's code