random change
merged
finally fixed lag