Updated spec to match what we discussed in pull request #9