full ddl update with rubicon changes