Improved dynamic stuff of the demo