updated hybrid struct, still needs work