for demo fixes

as