Finished making demos work