Revisions

Jamie Chavez Update
Wim van Dam Initial message