Fixing final versions of code