updates from macbook. Prepare for merge conflicts