Mac commit

commit to sync from crash