Finalization for 2.2