Adding to the Demo a bit