Added option to change the generated values