import code from Fabrice's repository