Newest edits to the code