Migrate to MAC fisrt step