all revisions implemented per Ronnie's request