add changes by bkons
enable randomization