New changes

Finalization