finish MAC rebuild
Merge branch 'rebuilding-MAC'