improves the DB and organization