updates from personal macbook
merge