Updated to reflect changes in the cpp