Edit to Sam's DDL