Made the demo universal.