updating and testing getting from mac (committed on pleiades)