changes for HTS demo 2.2