changes done from mac

changes done from mac