Closes issue #1711, and changes where the update references are stored