merge with macbook version