Personally I don’t have any problem with the original stuff you had with the primary and secondary, but the 2nd idea that Light has makes sense when combined with that I think