changes for HTS demo 2.1.1