todo added for diag<- @vjovanov