Changes to fit to MAC model