Fixed everything but database