restart: add more HTC code