More optimization to leaderboard