Update to reflect changes in code