Improved scheduler to stop empty games