ADD refactoring in viewStateHidden