Demopage fix part2