Implemented the new revisions first suggested