mixed demo with core data fix