More iteration

https://www.pivotaltracker.com/story/show/61166142