Update to htc-first