added randomly generated non colliding randomly rotated tokens
merge fix