Pre demo refactoring.