Some more demonstration changes