Re-add finalize loop