Initializations of matrices improved (small change)