Story-67-david: finished