Somemore game changes
Merging conflicts