integrated: matt and nori

integrated: matt and nori