Final Commit on Mac