Reworking of concentrators and minor changes of other