Update logic, lambda, iterator from develop.