updated table names, finished methods