Game Logic Improvement