Matroid: updated version