Removed custom code; used iteration token instead