Latest developments. See diff detail.