#9 dao changes. It works properly :+1: