Connect version 2 to version 3

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>