Updates for first demo of the system