Updated and Finalized