Add Hiits and improve convergence, ...