Vocabulary: changed matrix dim to matrix shape