initial edits for mac