latest changes to have the demo working