improved datastore randomization