Next iteration. Some changes.