Is there any need for diag and zeros (which are part of the current matrices)?