Finalization for 0.7