changes to mac and header