added  calls to factories to get data in stead of having hard coded data