Updated per peer review and updated specs to include new logic