smoke, 321 counter, in game gui in progress
merged conflicts
In game gui finished