#2 final changes for haos demo