changed object variables names, to match fields in db