Final adjustments for demo