Refactor for demoing.