Mac changes. Still a bit in flux.