structure updated, cd implemented