Updating all parts of the code