Updates to reflect new changes