Replacing the last temporary codes with final versions