Slight changes while reviewing use cases and test cases.