working on game service
merged in changes