Updated for Yosemite