Matrix: updated to latest iterator method