still fixing db dupliicate bug