initial set of changes made from mac