Refactored demos