Better integration of Tibor's games.