Updated for Mavericks