Make demo work with out expansion.