Database issue fix4
more ammend
junk