updated database_setup