DDL almost done