Ref: Removed oldState