demo fixes
fixed merge