Latest changes as I made the last pull request.