change to the samples composition creation.