--changed mysql queries to match tables that were decided upon