mixed demo with core data fix
demo is update to date