after demo fixes