Extension of farmers&#8217; averaging to give greater flexibility