[tz] Filling the gaps ...