Logic: OK ! Next step: comments & doc