added additional from clause to specify data to be included