Latest changes for public demo