Refactored Demo