Fixing database try 2