added email field and combined tables