Second pull request

Better than the first.