Address some review comments from Duncan. This moves the iterative