Updates to reflect the latest version of the code