Database added, but buggy