Adam's changes to wham and cluster following previous commit