Demo changes #20