changes from macbook
merge