reworked all prototypes to work with HTC-class