Updated to reflect new changes