Migrated to loop-recur