improved demo template