Added WR clustering.