updated by Ryan in another mac