edit to UC #21