Changes for the demonstration