changed to struct type