Update to new for-loop protocol