Refactored to not creating new scope on every state change

i think we need to remove this line - latest demos are breaking with it