Add more HTC stuff