Changed diag to blkdiag
Added DropSpace
reenabled blkdiag