Updated with Mavericks notes