Updated with keynote and docs