Fixing things up for demonstration