Pre refactor state