Updated this to match with the keynote presentation and moved it