Finalized Second Version