Moved sample generator, changed version