module2: improvements