Modify for mavericks