Updating the subscription demo to be a bit friendlier