6abdfd0 improve repertoire building