some improvements of "Migrating to version 2.1"