added user names, and changed views and databases