Update to reflect all changes