Made Ray a struct