Changed random generator a bit