prepare: improvements