Updating code for Yosemite release.