changes for matrix separator (from Ricardo)