latest version of the code with the old versions commented out