Update to reflect new changes