new version

fixed bugs on the ddl