alexandre, alive would like that you add a comment explaining how you distinguish  the old and the new API