changes to support demo install
more changes to support demo