+Improve end game detection