Tune and add feature about nheads