rejig models for less repetition