reconcile with improvements from work mac