-_-;; changes for yosemite