Infrastructure demo fixed and working