UPDATE big changes to demo page, a lot better performance plus other changes