updated for mavericks