Partially switch from matrix to lists