Rearranged members a bit in preparations to split out active info
p4#: 20381