commit #3 from mac