Updated finalization