huge update to demos