Adding tailing and scailing to the demo