merged Dylan_David and Patrick into CCC_Note