Speed improvements in demo