Edits to the code