v0.37 - unified EffectState
v0.37 - unified EffectState