made parallel changes in strio/matrix version that had been made in normal version