small changes before performance Cor&Som