Core chanegs to demo files