DAO note and elif fix