Finalized the changes