modifications for public demo