Update to reflect submitted code