Merged changes from Reg and GameState to GameEvent

Merged changes from Reg and GameState to GameEvent