improve the preso
use 2.1.0 and 2.0.0
fix the tests