Merge extraneous Jeff material
Merge extraneous Jeff material 2