#81 make use of 1 matrix for entities