added all samples (old)
xs-s have unified names