MAC stuff that needs to go