Code fix up/ Game fix