Changes to use in mac