Updated with current revisions