Taguri: improvements