More fixes for demo 1 - standard demo now imports to 2nd environment