Corrected & Finalized