Adjustments for demo