BugFix, demo cleaned