still remains some DB issues