Needs more Mac seperation