This isn't necessary, as only save and search use it, but in the event of a one off construction -- removed and updated comments