Updated per peer review and updated specs.