Preparation for completion of "demo mode"