Added HX2, now includes interface calculator. Removed interface calculator