merged in changes from work macbook