Updated with config from macbook