Fixing merge conflicts
Last minute fixes for demo