Changes made, tests pass.