LinkDao take 2

Is this better?