Committing changes per apol's requests.