changed to tuple to struct