nice, this is more resilient to state now