Demo copy improvements @zackbloom