macbook changes
merged changes