Changed a few things here
Database