Updated to latest revisions