Some late update to make the demo move more smoothly.