optimizations for demo pages
optimizations for demo pages