Revised for  HiFace Two.