integrated Matt's module