final round of changes for demo