refactored DDL, added donor table