Adding HTC & Cleaning up