Change: beginning refactoring for beta