Demopage fix part1