Finalized version

Finalized version