dao changes
fixes