Tweaking initializer for live demo capability