Changed way of creating Samples. Reviewed Trainer