Renovation of the demo cases